From: Reinhard Tartler Date: Mon, 27 Oct 2025 19:04:54 +0000 (-0400) Subject: Commit Debian 3.0 (quilt) metadata X-Git-Tag: archive/raspbian/1.4.6-10.1+rpi1^2 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=7434c503849f1d2f461ddf98abbcddd6727afb7a;p=crowdsec.git Commit Debian 3.0 (quilt) metadata [dgit (13.16) quilt-fixup] --- diff --git a/debian/patches/fix-compilation-with-docker27-closes-111.patch b/debian/patches/fix-compilation-with-docker27-closes-111.patch new file mode 100644 index 0000000..750938e --- /dev/null +++ b/debian/patches/fix-compilation-with-docker27-closes-111.patch @@ -0,0 +1,39 @@ +From: Reinhard Tartler +Date: Mon, 27 Oct 2025 15:01:14 -0400 +X-Dgit-Generated: 1.4.6-10.1 0458aec25af446071f185aafd60250f28c7d1da8 +Subject: Fix compilation with docker27, Closes: #1118455 + + +--- + +diff --git a/pkg/metabase/container.go b/pkg/metabase/container.go +index 2368a9b..131a5c9 100644 +--- a/pkg/metabase/container.go ++++ b/pkg/metabase/container.go +@@ -6,7 +6,7 @@ import ( + "fmt" + "runtime" + +- "github.com/docker/docker/api/types" ++ "github.com/docker/docker/api/types/image" + "github.com/docker/docker/api/types/container" + "github.com/docker/docker/api/types/mount" + "github.com/docker/docker/client" +@@ -46,7 +46,7 @@ func NewContainer(listenAddr string, listenPort string, sharedFolder string, con + func (c *Container) Create() error { + ctx := context.Background() + log.Printf("Pulling docker image %s", c.Image) +- reader, err := c.CLI.ImagePull(ctx, c.Image, types.ImagePullOptions{}) ++ reader, err := c.CLI.ImagePull(ctx, c.Image, image.PullOptions{}) + if err != nil { + return fmt.Errorf("failed to pull docker image : %s", err) + } +@@ -168,7 +168,7 @@ func RemoveImageContainer() error { + } + ctx := context.Background() + log.Printf("Removing docker image '%s'", metabaseImage) +- if _, err := cli.ImageRemove(ctx, metabaseImage, types.ImageRemoveOptions{}); err != nil { ++ if _, err := cli.ImageRemove(ctx, metabaseImage, image.RemoveOptions{}); err != nil { + return fmt.Errorf("failed to remove image container %s : %s", metabaseImage, err) + } + return nil diff --git a/debian/patches/series b/debian/patches/series index 47a2515..27d8671 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -15,3 +15,4 @@ 0019-disable-unreliable-test-TestStreaming.patch 0020-add-patch-to-build-with-docker-26.patch 0021-backport-sshd-session-support.patch +fix-compilation-with-docker27-closes-111.patch